Skip to content

xtensa-build-zephyr: use separate Zephyr config for TGPH builds#5443

Merged
lgirdwood merged 1 commit into
thesofproject:mainfrom
kv2019i:topic/use-cavs25-tgph
Mar 1, 2022
Merged

xtensa-build-zephyr: use separate Zephyr config for TGPH builds#5443
lgirdwood merged 1 commit into
thesofproject:mainfrom
kv2019i:topic/use-cavs25-tgph

Conversation

@kv2019i
Copy link
Copy Markdown
Collaborator

@kv2019i kv2019i commented Feb 28, 2022

Zephyr recently added support for separate configs for 2-core and 4-core
variants of cAVS2.5. Use the new "tgph" configuration for when building
SOF for TigerLake-H variant.

BugLink: #5018
Signed-off-by: Kai Vehmanen kai.vehmanen@linux.intel.com

@kv2019i
xtensa-build-zephyr: use separate Zephyr config for TGPH builds
a2b13e5 
Zephyr recently added support for separate configs for 2-core and 4-core
variants of cAVS2.5. Use the new "tgph" configuration for when building
SOF for TigerLake-H variant.

BugLink: thesofproject#5018
Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
@kv2019i kv2019i requested a review from marc-hb as a code owner February 28, 2022 10:59
This was referenced Feb 28, 2022
Merged
Closed
@lgirdwood
Copy link
Copy Markdown
Member

lgirdwood commented Feb 28, 2022

@kv2019i @keqiaozhang do we need to update CI Zephyr commit ID ?

CMake Error at /srv/home/jenkins/workspace/sof_generic_build/zephyrproject/zephyr/cmake/app/boilerplate.cmake:388 (message):
  Invalid BOARD; see above.
Call Stack (most recent call first):
  /srv/home/jenkins/workspace/sof_generic_build/zephyrproject/zephyr/share/zephyr-package/cmake/ZephyrConfig.cmake:24 (include)
  /srv/home/jenkins/workspace/sof_generic_build/zephyrproject/zephyr/share/zephyr-package/cmake/ZephyrConfig.cmake:35 (include_boilerplate)
  CMakeLists.txt:5 (find_package)


-- Configuring incomplete, errors occurred!
FATAL ERROR: command exited with status 1: /usr/bin/cmake -DWEST_PYTHON=/usr/bin/python3 -B/srv/home/jenkins/workspace/sof_generic_build/zephyrproject/build-tgl-h -S/srv/home/jenkins/workspace/sof_generic_build/zephyrproject/zephyr/samples/subsys/audio/sof -GNinja -DBOARD=intel_adsp_cavs25_tgph
Traceback (most recent call last):
  File "./scripts/xtensa-build-zephyr.py", line 460, in <module>
    main()
  File "./scripts/xtensa-build-zephyr.py", line 455, in main
    run_point_mode()
  File "./scripts/xtensa-build-zephyr.py", line 442, in run_point_mode
    build_platforms()
  File "./scripts/xtensa-build-zephyr.py", line 362, in build_platforms
    execute_command(build_cmd, check=True, cwd=west_top)
  File "./scripts/xtensa-build-zephyr.py", line 203, in execute_command
    return subprocess.run(args=command_args, stdin=stdin, input=input, stdout=stdout,
  File "/usr/lib/python3.8/subprocess.py", line 516, in run
    raise CalledProcessError(retcode, process.args,
subprocess.CalledProcessError: Command '['west', 'build', '--build-dir', 'build-tgl-h', '--board', 'intel_adsp_cavs25_tgph', '/srv/home/jenkins/workspace/sof_generic_build/zephyrproject/zephyr/samples/subsys/audio/sof', '--']' returned non-zero exit status 1.

@kv2019i kv2019i mentioned this pull request Feb 28, 2022
Closed
@kv2019i
Copy link
Copy Markdown
Collaborator Author

kv2019i commented Feb 28, 2022

Yes @lgirdwood , we need SOF CI to pick latest Zephyr upstream before this can be tested and merged.

@marc-hb
Copy link
Copy Markdown
Collaborator

marc-hb commented Feb 28, 2022

We have two xtensa-build-zephyr build scripts right now, transitioning from .sh to .py. Please keep the filename extension in the commit subject otherwise it makes managing the transition period much harder than it has to be.

@kv2019i
Copy link
Copy Markdown
Collaborator Author

kv2019i commented Mar 1, 2022

@marc-hb wrote:

We have two xtensa-build-zephyr build scripts right now, transitioning from .sh to .py. Please keep the filename extension in the commit subject otherwise it makes managing the transition period much harder than it has to be.

Ack. I'm updating both, so kept the title on purpose for both.

@kv2019i
Copy link
Copy Markdown
Collaborator Author

kv2019i commented Mar 1, 2022

SOFCI TEST

@marc-hb
Copy link
Copy Markdown
Collaborator

marc-hb commented Mar 1, 2022

Ack. I'm updating both, so kept the title on purpose for both.

Apologies I hastily copied this comment from another, similar PR that was updating only one of them.

@kv2019i
Copy link
Copy Markdown
Collaborator Author

kv2019i commented Mar 1, 2022 •
edited
Loading

The one device test failure is due to:
#5456

This is caused by Zephyr upstream changes and needs a SOF PR to address.
UPDATE: this will be fixed by 2nd patch of #5455

@lgirdwood
Copy link
Copy Markdown
Member

lgirdwood commented Mar 1, 2022

CI runtime failure is unrelated.

@lgirdwood lgirdwood merged commit 26e08d4 into thesofproject:main Mar 1, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@lgirdwood lgirdwood lgirdwood approved these changes

@marc-hb marc-hb Awaiting requested review from marc-hb

@aborisovich aborisovich Awaiting requested review from aborisovich

@keqiaozhang keqiaozhang Awaiting requested review from keqiaozhang

@lyakh lyakh Awaiting requested review from lyakh

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@kv2019i @lgirdwood @marc-hb